From bc96e116dc5a14a4c1be2fefd4cd19705456eb73 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 11 Dec 2014 20:20:29 -0800 Subject: [PATCH] Bump rustc version --- Cargo.lock | 18 +++++++++--------- src/cargo/core/dependency.rs | 2 +- src/cargo/core/manifest.rs | 2 +- src/cargo/core/registry.rs | 2 +- src/cargo/core/resolver/mod.rs | 1 + src/cargo/core/shell.rs | 1 + src/cargo/ops/cargo_rustc/context.rs | 2 +- src/cargo/ops/cargo_rustc/job_queue.rs | 2 +- src/cargo/ops/cargo_rustc/mod.rs | 2 +- src/cargo/util/config.rs | 2 +- src/cargo/util/dependency_queue.rs | 2 +- src/cargo/util/toml.rs | 2 ++ src/cargo/util/vcs.rs | 2 ++ src/registry/lib.rs | 2 +- src/rustversion.txt | 2 +- 15 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc08e3f2c..368da9e1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ [[package]] name = "curl" version = "0.1.0" -source = "git+https://github.com/carllerche/curl-rust#6f007b4967ec12e36937dcb081abe0bdb3bcc508" +source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce" dependencies = [ "curl-sys 0.1.0 (git+https://github.com/carllerche/curl-rust)", "url 0.2.2 (git+https://github.com/servo/rust-url)", @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "curl-sys" version = "0.1.0" -source = "git+https://github.com/carllerche/curl-rust#6f007b4967ec12e36937dcb081abe0bdb3bcc508" +source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce" dependencies = [ "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)", "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)", @@ -43,7 +43,7 @@ source = "git+https://github.com/docopt/docopt.rs#38cc4572bef4dc5cbcb7526500aa14 [[package]] name = "flate2" version = "0.1.0" -source = "git+https://github.com/alexcrichton/flate2-rs#5cf5e4f57166053590a7f63507f65da72d4e74eb" +source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea" dependencies = [ "miniz-sys 0.1.0 (git+https://github.com/alexcrichton/flate2-rs)", ] @@ -61,7 +61,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "git2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#53785d74f5199455501c4ece0c9dd325a01db894" +source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d" dependencies = [ "libgit2-sys 0.0.1 (git+https://github.com/alexcrichton/git2-rs)", "time 0.1.1 (git+https://github.com/rust-lang/time)", @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "glob" version = "0.1.0" -source = "git+https://github.com/rust-lang/glob#6b26e61315196f198ce9f6553912c0378e399153" +source = "git+https://github.com/rust-lang/glob#7e1bd4c5917fde41861ee93e067d5d84d3caf5d1" [[package]] name = "hamcrest" @@ -81,7 +81,7 @@ source = "git+https://github.com/carllerche/hamcrest-rust.git#2b9bd6cdae5dcf08ac [[package]] name = "libgit2-sys" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#53785d74f5199455501c4ece0c9dd325a01db894" +source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d" dependencies = [ "libssh2-sys 0.0.1 (git+https://github.com/alexcrichton/ssh2-rs)", "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)", @@ -109,7 +109,7 @@ dependencies = [ [[package]] name = "miniz-sys" version = "0.1.0" -source = "git+https://github.com/alexcrichton/flate2-rs#5cf5e4f57166053590a7f63507f65da72d4e74eb" +source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea" dependencies = [ "gcc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -142,7 +142,7 @@ dependencies = [ [[package]] name = "semver" version = "0.1.3" -source = "git+https://github.com/rust-lang/semver#9ea3324350693954d3e5d10d43e240db224deff9" +source = "git+https://github.com/rust-lang/semver#c09b5bdf6b2fcaa719da588a7da98b1145264f56" [[package]] name = "tar" @@ -165,5 +165,5 @@ source = "git+https://github.com/alexcrichton/toml-rs#25e10a82565d81b5243304c835 [[package]] name = "url" version = "0.2.2" -source = "git+https://github.com/servo/rust-url#bdda3a7bb946e5f85dd3daeefb54c06fffa8350c" +source = "git+https://github.com/servo/rust-url#c54ef93a7bfdd7a43b33571b9614376aa5279181" diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index 97a2dc71c..67c8a0a02 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -22,7 +22,7 @@ pub struct Dependency { only_for_platform: Option, } -#[deriving(PartialEq, Clone, Show)] +#[deriving(PartialEq, Clone, Show, Copy)] pub enum Kind { Normal, Development, diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index c72ee2313..51c16ff27 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -81,7 +81,7 @@ impl> Encodable for Manifest { } } -#[deriving(Show, Clone, PartialEq, Hash, Encodable)] +#[deriving(Show, Clone, PartialEq, Hash, Encodable, Copy)] pub enum LibKind { Lib, Rlib, diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 1c6c592df..c2c89da5c 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -63,7 +63,7 @@ pub struct PackageRegistry<'a> { locked: HashMap)>>>, } -#[deriving(PartialEq, Eq)] +#[deriving(PartialEq, Eq, Copy)] enum Kind { Override, Locked, diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 956a3f3b8..1318a9ec3 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -29,6 +29,7 @@ pub struct Resolve { metadata: Option, } +#[deriving(Copy)] pub enum Method<'a> { Everything, Required(/* dev_deps = */ bool, diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index 191b5a7b2..7a83ac491 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -6,6 +6,7 @@ use std::fmt::Show; use self::AdequateTerminal::{NoColor, Colored}; +#[deriving(Copy)] pub struct ShellConfig { pub color: bool, pub verbose: bool, diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index def445d89..468b4f136 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -11,7 +11,7 @@ use super::TargetConfig; use super::layout::{Layout, LayoutProxy}; use super::custom_build::BuildState; -#[deriving(Show)] +#[deriving(Show, Copy)] pub enum Platform { Target, Plugin, diff --git a/src/cargo/ops/cargo_rustc/job_queue.rs b/src/cargo/ops/cargo_rustc/job_queue.rs index 256ee73cd..221dbdec6 100644 --- a/src/cargo/ops/cargo_rustc/job_queue.rs +++ b/src/cargo/ops/cargo_rustc/job_queue.rs @@ -47,7 +47,7 @@ struct PendingBuild { /// /// Each build step for a package is registered with one of these stages, and /// each stage has a vector of work to perform in parallel. -#[deriving(Hash, PartialEq, Eq, Clone, PartialOrd, Ord, Show)] +#[deriving(Hash, PartialEq, Eq, Clone, PartialOrd, Ord, Show, Copy)] pub enum Stage { Start, BuildCustomBuild, diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index c8543f5eb..8f8056cda 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -25,7 +25,7 @@ mod job_queue; mod layout; mod links; -#[deriving(PartialEq, Eq, Hash, Show)] +#[deriving(PartialEq, Eq, Hash, Show, Copy)] pub enum Kind { Host, Target } #[deriving(Default, Clone)] diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs index 840af09e0..f49ce8544 100644 --- a/src/cargo/util/config.rs +++ b/src/cargo/util/config.rs @@ -93,7 +93,7 @@ impl<'a> Config<'a> { } } -#[deriving(Eq,PartialEq,Clone,Encodable,Decodable)] +#[deriving(Eq, PartialEq, Clone, Encodable, Decodable, Copy)] pub enum Location { Project, Global diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs index 93d521421..3f2414e18 100644 --- a/src/cargo/util/dependency_queue.rs +++ b/src/cargo/util/dependency_queue.rs @@ -39,7 +39,7 @@ pub struct DependencyQueue { /// /// A fresh package does not necessarily need to be rebuilt (unless a dependency /// was also rebuilt), and a dirty package must always be rebuilt. -#[deriving(PartialEq, Eq, Show)] +#[deriving(PartialEq, Eq, Show, Copy)] pub enum Freshness { Fresh, Dirty, diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs index bdacd347f..6bcbdef21 100644 --- a/src/cargo/util/toml.rs +++ b/src/cargo/util/toml.rs @@ -228,6 +228,7 @@ pub struct TomlProfiles { } #[deriving(Decodable, Clone, Default)] +#[allow(missing_copy_implementations)] pub struct TomlProfile { opt_level: Option, lto: Option, @@ -673,6 +674,7 @@ fn normalize(libs: &[TomlLibTarget], log!(4, "normalizing toml targets; lib={}; bin={}; example={}; test={}, benches={}", libs, bins, examples, tests, benches); + #[deriving(Copy)] enum TestDep { Needed, NotNeeded } fn merge(profile: Profile, toml: &Option) -> Profile { diff --git a/src/cargo/util/vcs.rs b/src/cargo/util/vcs.rs index 3528875aa..f18d6dcc4 100644 --- a/src/cargo/util/vcs.rs +++ b/src/cargo/util/vcs.rs @@ -1,3 +1,5 @@ +#![allow(missing_copy_implementations)] + use git2; use util::{CargoResult, process}; diff --git a/src/registry/lib.rs b/src/registry/lib.rs index 4ff2b2730..d87576808 100644 --- a/src/registry/lib.rs +++ b/src/registry/lib.rs @@ -20,7 +20,7 @@ pub struct Registry { pub type Result = result::Result; -#[deriving(PartialEq)] +#[deriving(PartialEq, Copy)] pub enum Auth { Authorized, Unauthorized diff --git a/src/rustversion.txt b/src/rustversion.txt index 1ff25f20e..e0243f047 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2014-12-06 +2014-12-12 -- 2.30.2